make create_event in dry_run work the same as the normal one; fix width of editor
Andrew Cantino
共有 4 个文件被更改，包括 10 次插入 和 3 次删除
+ 1
- 1
Gemfile.lock
@@ -388,7 +388,7 @@ GEM |
||
| 388 | 388 |
slop (3.6.0) |
| 389 | 389 |
spectrum-rails (1.3.4) |
| 390 | 390 |
railties (>= 3.1) |
| 391 |
- spring (1.3.3) |
|
| 391 |
+ spring (1.3.6) |
|
| 392 | 392 |
spring-commands-rspec (1.0.4) |
| 393 | 393 |
spring (>= 0.9.1) |
| 394 | 394 |
sprockets (2.12.3) |
+ 7
- 1
app/assets/stylesheets/application.css.scss.erb
@@ -174,12 +174,18 @@ span.not-applicable:after {
|
||
| 174 | 174 |
|
| 175 | 175 |
// Credentials and Ace Editor |
| 176 | 176 |
|
| 177 |
-#ace-credential-value, .ace-editor {
|
|
| 177 |
+#ace-credential-value {
|
|
| 178 | 178 |
position: relative; |
| 179 | 179 |
width: 940px; |
| 180 | 180 |
height: 300px; |
| 181 | 181 |
} |
| 182 | 182 |
|
| 183 |
+.ace-editor {
|
|
| 184 |
+ position: relative; |
|
| 185 |
+ width: 550px; |
|
| 186 |
+ height: 300px; |
|
| 187 |
+} |
|
| 188 |
+ |
|
| 183 | 189 |
// Disabled |
| 184 | 190 |
|
| 185 | 191 |
.agent-unavailable {
|
+ 1
- 0
app/concerns/dry_runnable.rb
@@ -56,6 +56,7 @@ module DryRunnable |
||
| 56 | 56 |
def create_event(event_hash) |
| 57 | 57 |
if can_create_events? |
| 58 | 58 |
@dry_run_results[:events] << event_hash[:payload] |
| 59 |
+ events.build({ user: user, expires_at: new_event_expiration_date }.merge(event_hash))
|
|
| 59 | 60 |
else |
| 60 | 61 |
error "This Agent cannot create events!" |
| 61 | 62 |
end |
+ 1
- 1
app/models/agents/java_script_agent.rb
@@ -135,7 +135,7 @@ module Agents |
||
| 135 | 135 |
end |
| 136 | 136 |
|
| 137 | 137 |
def credential_referenced_by_code |
| 138 |
- interpolated['code'] =~ /\Acredential:(.*)\Z/ && $1 |
|
| 138 |
+ interpolated['code'] =~ /\Acredential:(.*)\Z/ && $1.strip |
|
| 139 | 139 |
end |
| 140 | 140 |
|
| 141 | 141 |
def setup_javascript |